From 27401e1e46e705afc8656c8c780c3c3e73c0c38c Mon Sep 17 00:00:00 2001 From: Alex Larsson Date: Sat, 8 Sep 2001 00:30:13 +0000 Subject: [PATCH] Removed unused function. 2001-09-07 Alex Larsson * gdk/linux-fb/gdkcolor-fb.c: Removed unused function. * gdk/linux-fb/gdkdrawable-fb2.c * gdk/linux-fb/gdkfont-fb.c: Use PangoLanguage functions. * gdk/linux-fb/gdkinput.c: * gdk/linux-fb/gdkselection-fb.c: Fix const warnings. * gdk/linux-fb/gdkwindow-fb.c: Fix warning. Implement gdk_window_set_icon_list() and gdk_window_get_frame_extents(). (No icon support yet though.) * gtk/gtkwindow.c (gtk_window_get_position): If window->frame is set get the extents of it instead. --- ChangeLog | 20 ++++++++++++++++++++ ChangeLog.pre-2-0 | 20 ++++++++++++++++++++ ChangeLog.pre-2-10 | 20 ++++++++++++++++++++ ChangeLog.pre-2-2 | 20 ++++++++++++++++++++ ChangeLog.pre-2-4 | 20 ++++++++++++++++++++ ChangeLog.pre-2-6 | 20 ++++++++++++++++++++ ChangeLog.pre-2-8 | 20 ++++++++++++++++++++ gdk/linux-fb/gdkcolor-fb.c | 9 --------- gdk/linux-fb/gdkdrawable-fb2.c | 2 +- gdk/linux-fb/gdkfont-fb.c | 2 +- gdk/linux-fb/gdkinput.c | 2 +- gdk/linux-fb/gdkkeyboard-fb.c | 1 + gdk/linux-fb/gdkselection-fb.c | 2 +- gdk/linux-fb/gdkwindow-fb.c | 24 ++++++++++++++++++++++-- gtk/gtkwindow.c | 5 ++++- 15 files changed, 171 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d1d8d35a1d..d366c7711b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,23 @@ +2001-09-07 Alex Larsson + + * gdk/linux-fb/gdkcolor-fb.c: + Removed unused function. + + * gdk/linux-fb/gdkdrawable-fb2.c + * gdk/linux-fb/gdkfont-fb.c: + Use PangoLanguage functions. + + * gdk/linux-fb/gdkinput.c: + * gdk/linux-fb/gdkselection-fb.c: + Fix const warnings. + + * gdk/linux-fb/gdkwindow-fb.c: + Fix warning. Implement gdk_window_set_icon_list() and + gdk_window_get_frame_extents(). (No icon support yet though.) + + * gtk/gtkwindow.c (gtk_window_get_position): + If window->frame is set get the extents of it instead. + Fri Sep 7 18:50:59 2001 Owen Taylor * gtk/gtkwidget.c (gtk_widget_get_default_colormap): diff --git a/gdk/linux-fb/gdkcolor-fb.c b/gdk/linux-fb/gdkcolor-fb.c index e720058ca6..57428bfea8 100644 --- a/gdk/linux-fb/gdkcolor-fb.c +++ b/gdk/linux-fb/gdkcolor-fb.c @@ -201,15 +201,6 @@ gdk_colormap_new (GdkVisual *visual, return colormap; } -#define MIN_SYNC_TIME 2 - -static void -gdk_colormap_sync (GdkColormap *colormap, - gboolean force) -{ - -} - GdkColormap* gdk_colormap_get_system (void) { diff --git a/gdk/linux-fb/gdkdrawable-fb2.c b/gdk/linux-fb/gdkdrawable-fb2.c index 0fa7cc8346..fcca45bf0f 100644 --- a/gdk/linux-fb/gdkdrawable-fb2.c +++ b/gdk/linux-fb/gdkdrawable-fb2.c @@ -866,7 +866,7 @@ gdk_fb_draw_text(GdkDrawable *drawable, { gunichar wc = g_utf8_get_char (p); p = g_utf8_next_char (p); - shaper = pango_font_find_shaper (private->pango_font, "fr", wc); + shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc); if (shaper != last_shaper) { analysis.shape_engine = shaper; diff --git a/gdk/linux-fb/gdkfont-fb.c b/gdk/linux-fb/gdkfont-fb.c index ebd4bec06c..4d18b3c8a3 100644 --- a/gdk/linux-fb/gdkfont-fb.c +++ b/gdk/linux-fb/gdkfont-fb.c @@ -345,7 +345,7 @@ gdk_text_extents (GdkFont *font, { gunichar wc = g_utf8_get_char (p); p = g_utf8_next_char (p); - shaper = pango_font_find_shaper (private->pango_font, "fr", wc); + shaper = pango_font_find_shaper (private->pango_font, pango_language_from_string ("fr"), wc); if (shaper != last_shaper) { analysis.shape_engine = shaper; diff --git a/gdk/linux-fb/gdkinput.c b/gdk/linux-fb/gdkinput.c index d8015430ab..48053ddbb1 100644 --- a/gdk/linux-fb/gdkinput.c +++ b/gdk/linux-fb/gdkinput.c @@ -32,7 +32,7 @@ #include "gdkprivate.h" #include "gdkinputprivate.h" -static const GdkDeviceAxis gdk_input_core_axes[] = { +static GdkDeviceAxis gdk_input_core_axes[] = { { GDK_AXIS_X, 0, 0 }, { GDK_AXIS_Y, 0, 0 } }; diff --git a/gdk/linux-fb/gdkkeyboard-fb.c b/gdk/linux-fb/gdkkeyboard-fb.c index 2aebfff767..1f7d75dcbd 100644 --- a/gdk/linux-fb/gdkkeyboard-fb.c +++ b/gdk/linux-fb/gdkkeyboard-fb.c @@ -22,6 +22,7 @@ #include "gdkkeysyms.h" #include "gdkprivate-fb.h" #include +#include #include #include #include diff --git a/gdk/linux-fb/gdkselection-fb.c b/gdk/linux-fb/gdkselection-fb.c index 22956c788b..8a4b253ddf 100644 --- a/gdk/linux-fb/gdkselection-fb.c +++ b/gdk/linux-fb/gdkselection-fb.c @@ -407,7 +407,7 @@ gdk_text_property_to_utf8_list (GdkAtom encoding, gchar **local_list; gint local_count; gint i; - gchar *charset = NULL; + const gchar *charset = NULL; gboolean need_conversion = !g_get_charset (&charset); gint count = 0; GError *error = NULL; diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c index 3557bee26c..a5a997d7ee 100644 --- a/gdk/linux-fb/gdkwindow-fb.c +++ b/gdk/linux-fb/gdkwindow-fb.c @@ -2175,8 +2175,6 @@ void gdk_window_set_type_hint (GdkWindow *window, GdkWindowTypeHint hint) { - GdkAtom atom; - g_return_if_fail (window != NULL); g_return_if_fail (GDK_IS_WINDOW (window)); } @@ -2209,3 +2207,25 @@ gdk_window_begin_move_drag (GdkWindow *window, { g_return_if_fail (GDK_IS_WINDOW (window)); } + +void +gdk_window_set_icon_list (GdkWindow *window, + GList *pixbufs) +{ + /* We don't support icons right now */ +} + +/* No need to care about frames. Decoration is done by GtkWindow */ +void +gdk_window_get_frame_extents (GdkWindow *window, + GdkRectangle *rect) +{ + g_return_val_if_fail (window != NULL, 0); + + rect->x = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_x; + rect->y = GDK_DRAWABLE_IMPL_FBDATA (window)->abs_y; + rect->width = GDK_DRAWABLE_IMPL_FBDATA (window)->width; + rect->height = GDK_DRAWABLE_IMPL_FBDATA (window)->height; + + return TRUE; +} diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index 86ba6c46a9..0b51d273bd 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -2650,7 +2650,10 @@ gtk_window_get_position (GtkWindow *window, if (GTK_WIDGET_MAPPED (widget)) { - gdk_window_get_frame_extents (widget->window, &frame_extents); + if (window->frame) + gdk_window_get_frame_extents (window->frame, &frame_extents); + else + gdk_window_get_frame_extents (widget->window, &frame_extents); x = frame_extents.x; y = frame_extents.y; gtk_window_get_size (window, &w, &h); -- 2.30.2